Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Apr 2011 18:42:31 +0000 (11:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Apr 2011 18:42:31 +0000 (11:42 -0700)
commit9135c11fa303fd5c1eaa839be4199c234ef96bfe
treea5f23ce2c78b2a555aadfd9408f5ef2ce7a8e80f
parent9ee357f34b9a63ef36e1c8e1f06526db0eda02c1
parent332ce10139535723166b04b52ac6d34da7fefe94
Merge from mainline.
ChangeLog
lisp/ChangeLog
src/ChangeLog
src/coding.c
src/keyboard.c
src/lisp.h
src/term.c
src/window.c
src/xdisp.c
src/xterm.c